BZ-9171: Renaming

Signed-off-by: Paden <padenportillo@gmail.com>