Changed enum names to avoid namespace conflict