Little bit changed behavior and naming