Variable renaming to conventions