Fixed bug with same names in development environment