Fixed minor issue and naming.