Fixed issue and modified prop names