Revert "Just changed some naming"

This reverts commit e4eb8459c10b129cd7122a73f651694791a01363.
Revert "Revert "Just changed some naming""

This reverts commit 2b375018ded9406e7466cb7d528096c3df0235fc.