Update and rename Stack to stack