Code refractor to naming conventions