Fix up naming of sub classes (STI) and tests.