Refactor naming convention.

It should now be more consistant.