Fix names and remove MonitorStart.java