Pedantic renaming