[fixes] website templating & naming fixes