Use clearer names to distinguish between id and name
Simple code cleanup