Adds support for LMs with spaces in the name