Disambiguate some things

This needs to change; the "universe" system I have going is really bad.