Fixed a tiny bug with name scheme