refactor: cleaned up naming scheme