renaming fixes and changes