Change naming convention

PR in regards to issue #13.