Fixed layout issue naming problem