Change other things

I made the changes so long ago so I didn't know what to call it...
HOORAY FOR GENERIC NAMES!