changed ids to conform to naming conventions