Cleaning up names

Making build rule key names consistent
across languages to make it easier to
refactor common code across multiple
languages later.