Minor changes for better naming convension