Shortened several caps and symbols where trivial.