Improve nommap naming and use C style comments on create_from_file (#1084)

2 files changed