Naming rules, align, fixed some errors