Fixed a bug on naming