Issue 13: convert - to _ before save