cleaned up configuration and renamed some of them