Some small changes

Removed a misplaced trashcan and changed the map names of the
structures.