Changed naming convention. Added leading zeros