Short name changed, other bits
Removed style override