Tom Igoe

Remove ambiguities and convert to specifics