internal class and variable renames for consistency