rename scope -> block and fix exported function declarations