naming and id cleanup