Consistent Package API

Create a consistent API (mainly naming convention).