Initial refactor/rename.