Merge pull request #8 from jfallows/develop

Migrate naming to K3PO