Fixed a bug with naming