Updated some naming and CS

issue: #1148