Some renaming and text formatting

Signed-off-by: Lysander <lysandergc@gmail.com>