Tosec naming parser fixes