Hack for single quotes inside names

This may not be merged - but is open for suggestions about how we solve the problem, we could just make this a generic function and use it EVERYWHERE :)