Refactor/cleanup naming