Renamed everything. Fixes #2