Standardised workspace names and added more patterns