Remove Record class references.
Remove module alias, names are nice and short now.