Class name change and added namespace