Renames new entity systems for simplicity