(cherry picked from commit 4966e2ebc2)
4966e2ebc2
Also renames files & classes to fit dialog title and updates method names to match coding guidelines.