Some renaming/fixing for consistency