Fixing some other identifiers.
Updating build.