Changed table names to match schema