Fixes for common name editing