Name change and small bug fixes