Change naming convention

PR in regards to issue #13.

EDIT:  Seems that the PR is including old commits...