Renamed variable & template fix