Fix #11: Names not matching regex