The second definition is a gentrification of the first definition. They are intrinsically linked and cannot be separated.