Naming and Compatibility Changes

Changed variables name to comply with naming convention.
Also removed backward compatibility check.