Some fix to the code for a more logic class naming