Sorry, 日 will also take the にっ and ひ (rendaku’d to び) sounds in other words too.
For 月, @MissMisc has some good advice.