Change naming and be more clear on logic