Changed PublicAPI trait to objects, renaming