Updated phases to use Java standard naming