Fixed naming collision