some renaming fixes