Fixed naming and boundary conditions