Merge "Hardcode the className instead of class.getSimpleName()." into main