Fix #3: Parse name correctly