Fixed another name conflict issue