Const Correctness. Small Changes in naming