Fix bug with wrong names