Fix issue #63 and names with _ and reserved word