Fixed validation naming and added in cheap logic to check for plural/singular time units.