I tested it out quickly in Sandbox mode with a Master sword and a Drain saber and i confirm your statement.
Drain does not seem to upgrade to Fill but downgrades to Draw.
On the contrary Master upgrades to Lord, no difficulty.
I will try to test out further with other specials when i have time.