Updated names to match Oracle length restriction