Renamed config objects.
Separeted requirements.