Better naming
Update description