Renaming and a little cleanup