My Baguazhang teacher taught us that a master is someone who practiced his entire life to perfect their art/system. When they passed there were called Master. If they were the Head of the system, you would call them Grandmaster.

Similar to what you mentioned above, Wang Shifu.