Yes, there's too much ambiguity in the adjective 'commercial' used in multiple contexts in legislation.