mv keywords to identifier; fixed enum bug