Some little renaming stuffs

blah