Change naming to be agnostic to keywords