SyntaxKit renamings