Fixing some naming

Signed-off-by: LeJay <LeJayEmail@gmail.com>