remove underscores since they are only for reserved names and fixes #24