model names underscores bug modified