Rename things to more reasonable locations