Fixed naming conflcit