Use short name for classes in same package (bugfix)
Use class name as filename, not table name (bugfix)