Added better asserts to prevent name conflicts in future.