Cleaning out some dead code

And naming things nicer
Completed rename of extension and extension point

This fixes the actual listening to commands
FindBugs recommendations