Merge pull request #7 from jfallows/develop

Migrate naming to K3PO