Rename method for clarity and simplify the implementation of it.