More renaming and removing warnings