Fix #12: Eh.. No more default value for the default value.
Renamed models to reflect their true nature, sorta.
Removed unused import.