Variable name updates

Updated variable names to use underscores for consistency.