Cleaned up some of the naming and typing across the project.

Issue: GRL-34
Change-Id: I477a99c76f5c80c33de9e1e075b789496957cb69