Mainly for things we need to override.  More to come in later commits

Also includes a little class naming fix.