fix names and placeholders
before onChange refactoring
onChange refactoring completed