change some variable names

changing names to conform to app naming conventions.