DDF-463 Cleaned up from refactoring, used standard constants, renamed classes to remove ambiguity.