Replaced the lazy designers naming to constant naming