Removed redundant constants. Moved EnvironmentVariableNameProvider into the EnvironmentVariableProvider
Renamed Collector to Provider