refactoring: constant var names to caps