peer fixes, renaming defines, fixs in GK interfacing