More renaming and centering