Naming fixes

Clean up of project and improvments to consistency of naming.

Related to issue #12.