change name
refactoring
config's getting ugly but well w/e