More names changed and fixes