Renamed things beautifully

I swear they are beautiful now