Improved some names