Without looking up the actual terminology and cycle times for the two shorter calendars (which I don't remember anymore either), I think this is correct.