Few #defines and variables renamed as per naming convention