Wiper Motor Lube and Maintenance

I have used small 4-40 machine bolts and nuts in place of the rivets. I use Aeroshell 22 synthetic multi temp grease on stuff like this, but I work in aviation.