Naming convention horror.. And some cleanup