Fix bug with naming