am 418dcb88: Merge "check for long and short component names." into ub-now-nova

* commit '418dcb881a62162b2834321d362c2f8f01962493':
  check for long and short component names.