IdGeneraor -> IdGenerator
slight refactor