Simplifying and renaming for consistency