* Variables renaming cleanup