Some minor function renaming