Renames & cleanups from CR