re-align in cnc
fix inconsistent naming