Refactor naming conventions, begin key config use