Fix issue with comma seperated CSS selectors not working.

 * update variable names to be more descriptive.