Rename things to conventional names
More renames
Prepare 1.0.4 release