um: correct all declare commands