Renaming fixes