Add shortname only supprt for now using string before first dot.