change naming to common config