Closes #27 - Saner check names