Some variable/function renaming