Update and rename on.java to On.java