Integrated default methods.
Started more consistent naming convention.