Refactor variable names. Try to be consistent across all files. Use underscore convention.