Name changed to better reflect the purpose of the Java class/activity
Some references fixed
Some references fixed